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

Added biggest chunk of recipes again

Browse Source
This commit is contained in:
raoulvdberge
2017-06-15 21:06:41 +02:00
parent a3dcaf3ba3
commit b3ca85fc04
43 changed files with 1003 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,19 +14,19 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerFluids;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerItems;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerRedstone;
import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipePrintedProcessor;
import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipeProcessor;
import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipeUpgrade;
import com.raoulvdberge.refinedstorage.apiimpl.solderer.*;
import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.block.BlockCable;
import com.raoulvdberge.refinedstorage.block.FluidStorageType;
import com.raoulvdberge.refinedstorage.block.GridType;
import com.raoulvdberge.refinedstorage.block.ItemStorageType;
import com.raoulvdberge.refinedstorage.gui.GuiHandler;
import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks;
import com.raoulvdberge.refinedstorage.integration.forgeenergy.ReaderWriterHandlerForgeEnergy;
import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC;
import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
import com.raoulvdberge.refinedstorage.item.ItemFluidStoragePart;
import com.raoulvdberge.refinedstorage.item.ItemProcessor;
import com.raoulvdberge.refinedstorage.item.ItemStoragePart;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.network.*;
import com.raoulvdberge.refinedstorage.tile.*;
@@ -51,12 +51,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.List;
public class ProxyCommon {
protected List<BlockCable> cableTypes = new ArrayList<>();
public void preInit(FMLPreInitializationEvent e) {
CapabilityNetworkNodeProxy.register();
@@ -230,117 +225,6 @@ public class ProxyCommon {
// Silicon
GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5f);
/*
// Quartz Enriched Iron
GameRegistry.addRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 4),
"II",
"IQ",
'I', new ItemStack(Items.IRON_INGOT),
'Q', new ItemStack(Items.QUARTZ)
);
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 9), new ItemStack(RSBlocks.QUARTZ_ENRICHED_IRON));
// Block of Quartz Enriched Iron
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.QUARTZ_ENRICHED_IRON),
"EEE",
"EEE",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
);
// Machine Casing
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.MACHINE_CASING),
"EEE",
"ESE",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "stone"
));
// Construction Core
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.GLOWSTONE_DUST)
);
// Destruction Core
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(Items.QUARTZ)
);
// Relay
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.RELAY),
new ItemStack(RSBlocks.MACHINE_CASING),
new ItemStack(RSBlocks.CABLE),
new ItemStack(Blocks.REDSTONE_TORCH)
);
// Controller
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CONTROLLER, 1, ControllerType.NORMAL.getId()),
"EDE",
"SMS",
"ESE",
'D', new ItemStack(Items.DIAMOND),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'S', "itemSilicon"
));
// Solderer
GameRegistry.addRecipe(new ItemStack(RSBlocks.SOLDERER),
"ESE",
"E E",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(Blocks.STICKY_PISTON)
);
// Disk Drive
GameRegistry.addRecipe(new ItemStack(RSBlocks.DISK_DRIVE),
"ECE",
"EME",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'C', new ItemStack(Blocks.CHEST),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Cable
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CABLE, 12),
"EEE",
"GRG",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE)
));
// Wireless Transmitter
GameRegistry.addRecipe(new ItemStack(RSBlocks.WIRELESS_TRANSMITTER),
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);
// Grid
GameRegistry.addRecipe(new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()),
"ECE",
"PMP",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);*/
// Crafting Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, GridType.CRAFTING.getId()),
@@ -369,160 +253,6 @@ public class ProxyCommon {
));
/*
// Wireless Grid
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Portable Grid
GameRegistry.addRecipe(new ItemStack(RSBlocks.PORTABLE_GRID),
"EGE",
"ECE",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'G', new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()),
'C', new ItemStack(RSBlocks.CONTROLLER, 1, ControllerType.NORMAL.getId())
);
// Wireless Fluid Grid
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_FLUID_GRID, 1, ItemWirelessFluidGrid.TYPE_NORMAL),
"EPE",
"EGE",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'G', new ItemStack(RSBlocks.GRID, 1, GridType.FLUID.getId()),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Wireless Crafting Monitor
GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_CRAFTING_MONITOR, 1, ItemWirelessCraftingMonitor.TYPE_NORMAL),
"EPE",
"EME",
"EAE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.ENDER_PEARL),
'M', new ItemStack(RSBlocks.CRAFTING_MONITOR),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Writer
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.WRITER),
"ECE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Reader
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.READER),
"EDE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Crafter
GameRegistry.addRecipe(new ItemStack(RSBlocks.CRAFTER),
"ECE",
"AMA",
"EDE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING)
);
// Processing Pattern Encoder
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.PROCESSING_PATTERN_ENCODER),
"ECE",
"PMP",
"EFE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PATTERN),
'C', "workbench",
'F', new ItemStack(Blocks.FURNACE)
));
// External Storage
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.EXTERNAL_STORAGE),
"CED",
"HMH",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'H', "chest",
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.CABLE),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
));
// Importer
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Exporter
GameRegistry.addShapelessRecipe(new ItemStack(RSBlocks.EXPORTER),
new ItemStack(RSBlocks.CABLE),
new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Destructor
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DESTRUCTOR),
"EDE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Constructor
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.CONSTRUCTOR),
"ECE",
"RMR",
"EIE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'R', new ItemStack(Items.REDSTONE),
'M', new ItemStack(RSBlocks.CABLE),
'I', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Detector
GameRegistry.addRecipe(new ItemStack(RSBlocks.DETECTOR),
"ECE",
"RMR",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'R', new ItemStack(Items.REDSTONE),
'C', new ItemStack(Items.COMPARATOR),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
);
// Storage Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
"SES",
@@ -605,16 +335,6 @@ public class ProxyCommon {
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
));
// Storage Housing
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_HOUSING),
"GRG",
"R R",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
// Storage Disks
for (int type = 0; type <= 3; ++type) {
ItemStack disk = StorageDiskItem.initDisk(new ItemStack(RSItems.STORAGE_DISK, 1, type));
@@ -653,27 +373,7 @@ public class ProxyCommon {
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type)
);
}
// Pattern
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.PATTERN),
"GRG",
"RGR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
// Upgrade
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.UPGRADE, 1, 0),
"EGE",
"EPE",
"EGE",
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));*/
}*/
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
@@ -684,14 +384,6 @@ public class ProxyCommon {
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.initializeForFortune(2)));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.initializeForFortune(3)));
/*GameRegistry.addShapedRecipe(new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
"USU",
"SUS",
"USU",
'U', new ItemStack(Items.SUGAR),
'S', new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
);
// Storage Blocks
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeStorage(ItemStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
@@ -704,17 +396,6 @@ public class ProxyCommon {
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_256K, ItemFluidStoragePart.TYPE_256K));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeFluidStorage(FluidStorageType.TYPE_512K, ItemFluidStoragePart.TYPE_512K));
// Crafting Monitor
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.CRAFTING_MONITOR),
"EGE",
"GMG",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'G', "blockGlass",
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
));
// Interface
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.INTERFACE),
@@ -732,106 +413,6 @@ public class ProxyCommon {
OreDictionary.getOres("dustRedstone"),
NonNullList.withSize(1, new ItemStack(RSBlocks.INTERFACE))
));
// Grid Filter
GameRegistry.addShapedRecipe(new ItemStack(RSItems.FILTER),
"EPE",
"PHP",
"EPE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'H', new ItemStack(Blocks.HOPPER)
);
// Network Card
GameRegistry.addShapedRecipe(new ItemStack(RSItems.NETWORK_CARD),
"EEE",
"PAP",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(Items.PAPER),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Network Transmitter
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_TRANSMITTER),
"EEE",
"CMD",
"AAA",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Network Receiver
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.NETWORK_RECEIVER),
"AAA",
"CMD",
"EEE",
'E', new ItemStack(Items.ENDER_PEARL),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Disk Manipulator
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.DISK_MANIPULATOR),
"ESE",
"CMD",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', new ItemStack(RSItems.STORAGE_HOUSING),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
);
// Wrench
GameRegistry.addShapedRecipe(new ItemStack(RSItems.WRENCH),
"EPE",
"EEE",
" E ",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
);
// Security Manager
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.SECURITY_MANAGER),
"ECE",
"SMS",
"ESE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'S', new ItemStack(RSItems.SECURITY_CARD),
'C', "chest"
));
// Security Card
GameRegistry.addShapedRecipe(new ItemStack(RSItems.SECURITY_CARD),
"EEE",
"CAC",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'C', new ItemStack(RSItems.NETWORK_CARD),
'A', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
);
// Storage Monitor
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSBlocks.STORAGE_MONITOR),
"PCG",
"EMG",
"PDG",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
'M', new ItemStack(RSBlocks.MACHINE_CASING),
'G', "blockGlass"
));*/
}
public void init(FMLInitializationEvent e) {
@@ -857,13 +438,6 @@ public class ProxyCommon {
GameRegistry.register(block.createItem());
}
private void registerBlock(BlockCable cable) {
GameRegistry.<Block>register(cable);
GameRegistry.register(new ItemBlockBase(cable, cable.getDirection(), false));
cableTypes.add(cable);
}
private void registerTile(Class<? extends TileBase> tile, String id) {
GameRegistry.registerTileEntity(tile, RS.ID + ":" + id);

37
src/main/resources/assets/refinedstorage/recipes/_constants.json Normal file
View File

@@ -0,0 +1,37 @@
[
{
"name": "basic_processor",
"ingredient": {
"item": "refinedstorage:processor",
"data": 3
}
},
{
"name": "improved_processor",
"ingredient": {
"item": "refinedstorage:processor",
"data": 4
}
},
{
"name": "advanced_processor",
"ingredient": {
"item": "refinedstorage:processor",
"data": 5
}
},
{
"name": "construction_core",
"ingredient": {
"item": "refinedstorage:core",
"data": 0
}
},
{
"name": "destruction_core",
"ingredient": {
"item": "refinedstorage:core",
"data": 1
}
}
]

16
src/main/resources/assets/refinedstorage/recipes/block_of_quartz_enriched_iron.json Normal file
View File

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"EEE",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:quartz_enriched_iron_block"
}
}

24
src/main/resources/assets/refinedstorage/recipes/cable.json Normal file
View File

@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"GRG",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"R": {
"item": "minecraft:redstone"
}
},
"result": {
"item": "refinedstorage:cable",
"count": 12
}
}

14
src/main/resources/assets/refinedstorage/recipes/construction_core.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:basic_processor"
},
{
"item": "minecraft:glowstone_dust"
}
],
"result": {
"item": "refinedstorage:construction_core"
}
}

28
src/main/resources/assets/refinedstorage/recipes/constructor.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"RMR",
"EIE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "refinedstorage:construction_core"
},
"R": {
"item": "minecraft:redstone"
},
"M": {
"item": "refinedstorage:cable"
},
"I": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:constructor"
}
}

26
src/main/resources/assets/refinedstorage/recipes/controller.json Normal file
View File

@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EDE",
"SMS",
"ESE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"D": {
"item": "minecraft:diamond"
},
"S": {
"type": "forge:ore_dict",
"ore": "itemSilicon"
},
"M": {
"item": "refinedstorage:machine_casing"
}
},
"result": {
"item": "refinedstorage:controller"
}
}

28
src/main/resources/assets/refinedstorage/recipes/crafter.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"AMA",
"EDE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "refinedstorage:construction_core"
},
"A": {
"item": "refinedstorage:advanced_processor"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "refinedstorage:destruction_core"
}
},
"result": {
"item": "refinedstorage:crafter"
}
}

26
src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json Normal file
View File

@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EGE",
"GMG",
"EPE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"P": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:crafting_monitor"
}
}

14
src/main/resources/assets/refinedstorage/recipes/destruction_core.json Normal file
View File

@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:basic_processor"
},
{
"item": "minecraft:quartz"
}
],
"result": {
"item": "refinedstorage:destruction_core"
}
}

28
src/main/resources/assets/refinedstorage/recipes/destructor.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EDE",
"RMR",
"EIE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"D": {
"item": "refinedstorage:destruction_core"
},
"R": {
"item": "minecraft:redstone"
},
"M": {
"item": "refinedstorage:cable"
},
"I": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:destructor"
}
}

28
src/main/resources/assets/refinedstorage/recipes/detector.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"RMR",
"EPE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "minecraft:comparator"
},
"R": {
"item": "minecraft:redstone"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"P": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:detector"
}
}

26
src/main/resources/assets/refinedstorage/recipes/disk_drive.json Normal file
View File

@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"EME",
"EPE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"type": "forge:ore_dict",
"ore": "chest"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"P": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:disk_drive"
}
}

28
src/main/resources/assets/refinedstorage/recipes/disk_manipulator.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ESE",
"CMD",
"ESE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"S": {
"item": "refinedstorage:storage_housing"
},
"C": {
"item": "refinedstorage:construction_core"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "refinedstorage:destruction_core"
}
},
"result": {
"item": "refinedstorage:disk_manipulator"
}
}

17
src/main/resources/assets/refinedstorage/recipes/exporter.json Normal file
View File

@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:cable"
},
{
"item": "refinedstorage:construction_core"
},
{
"item": "refinedstorage:improved_processor"
}
],
"result": {
"item": "refinedstorage:exporter"
}
}

29
src/main/resources/assets/refinedstorage/recipes/external_storage.json Normal file
View File

@@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CED",
"HMH",
"EPE"
],
"key": {
"C": {
"item": "refinedstorage:construction_core"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"H": {
"type": "forge:ore_dict",
"ore": "chest"
},
"M": {
"item": "refinedstorage:cable"
},
"P": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:external_storage"
}
}

28
src/main/resources/assets/refinedstorage/recipes/grid.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"PMP",
"EDE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "refinedstorage:improved_processor"
},
"C": {
"item": "refinedstorage:construction_core"
},
"D": {
"item": "refinedstorage:destruction_core"
},
"M": {
"item": "refinedstorage:machine_casing"
}
},
"result": {
"item": "refinedstorage:grid"
}
}

22
src/main/resources/assets/refinedstorage/recipes/grid_filter.json Normal file
View File

@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"PHP",
"EPE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "minecraft:paper"
},
"H": {
"item": "minecraft:hopper"
}
},
"result": {
"item": "refinedstorage:grid_filter"
}
}

17
src/main/resources/assets/refinedstorage/recipes/importer.json Normal file
View File

@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:cable"
},
{
"item": "refinedstorage:destruction_core"
},
{
"item": "refinedstorage:improved_processor"
}
],
"result": {
"item": "refinedstorage:importer"
}
}

20
src/main/resources/assets/refinedstorage/recipes/machine_casing.json Normal file
View File

@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"ESE",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"S": {
"type": "forge:ore_dict",
"ore": "stone"
}
},
"result": {
"item": "refinedstorage:machine_casing"
}
}

22
src/main/resources/assets/refinedstorage/recipes/network_card.json Normal file
View File

@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"PAP",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "minecraft:paper"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:network_card"
}
}

28
src/main/resources/assets/refinedstorage/recipes/network_receiver.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AAA",
"CMD",
"EEE"
],
"key": {
"E": {
"item": "minecraft:ender_pearl"
},
"C": {
"item": "refinedstorage:construction_core"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "refinedstorage:destruction_core"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:network_receiver"
}
}

28
src/main/resources/assets/refinedstorage/recipes/network_transmitter.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"CMD",
"AAA"
],
"key": {
"E": {
"item": "minecraft:ender_pearl"
},
"C": {
"item": "refinedstorage:construction_core"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "refinedstorage:destruction_core"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:network_transmitter"
}
}

23
src/main/resources/assets/refinedstorage/recipes/pattern.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"RGR",
"EEE"
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"R": {
"item": "minecraft:redstone"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:pattern"
}
}

22
src/main/resources/assets/refinedstorage/recipes/portable_grid.json Normal file
View File

@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EGE",
"ECE",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"G": {
"item": "refinedstorage:grid"
},
"C": {
"item": "refinedstorage:controller"
}
},
"result": {
"item": "refinedstorage:portable_grid"
}
}

29
src/main/resources/assets/refinedstorage/recipes/processing_pattern_encoder.json Normal file
View File

@@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"PMP",
"EFE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"type": "forge:ore_dict",
"ore": "workbench"
},
"P": {
"item": "refinedstorage:pattern"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"F": {
"item": "minecraft:furnace"
}
},
"result": {
"item": "refinedstorage:processing_pattern_encoder"
}
}

18
src/main/resources/assets/refinedstorage/recipes/quartz_enriched_iron.json Normal file
View File

@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"II",
"IQ"
],
"key": {
"I": {
"item": "minecraft:iron_ingot"
},
"Q": {
"item": "minecraft:quartz"
}
},
"result": {
"item": "refinedstorage:quartz_enriched_iron"
}
}

12
src/main/resources/assets/refinedstorage/recipes/quartz_enriched_iron_from_block.json Normal file
View File

@@ -0,0 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:quartz_enriched_iron_block"
}
],
"result": {
"item": "refinedstorage:quartz_enriched_iron",
"count": 9
}
}

28
src/main/resources/assets/refinedstorage/recipes/reader.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EDE",
"RMR",
"EIE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"D": {
"item": "refinedstorage:destruction_core"
},
"R": {
"item": "minecraft:redstone"
},
"M": {
"item": "refinedstorage:cable"
},
"I": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:reader"
}
}

17
src/main/resources/assets/refinedstorage/recipes/relay.json Normal file
View File

@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "refinedstorage:machine_casing"
},
{
"item": "refinedstorage:cable"
},
{
"item": "minecraft:redstone_torch"
}
],
"result": {
"item": "refinedstorage:relay"
}
}

22
src/main/resources/assets/refinedstorage/recipes/security_card.json Normal file
View File

@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EEE",
"CAC",
"EEE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "refinedstorage:network_card"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:security_card"
}
}

26
src/main/resources/assets/refinedstorage/recipes/security_manager.json Normal file
View File

@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"SMS",
"ESE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"type": "forge:ore_dict",
"ore": "chest"
},
"S": {
"item": "refinedstorage:security_card"
},
"M": {
"item": "refinedstorage:machine_casing"
}
},
"result": {
"item": "refinedstorage:security_manager"
}
}

19
src/main/resources/assets/refinedstorage/recipes/solderer.json Normal file
View File

@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ESE",
"E E",
"ESE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"S": {
"item": "minecraft:sticky_piston"
}
},
"result": {
"item": "refinedstorage:solderer"
}
}

21
src/main/resources/assets/refinedstorage/recipes/stack_upgrade.json Normal file
View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"USU",
"SUS",
"USU"
],
"key": {
"U": {
"item": "minecraft:sugar"
},
"S": {
"item": "minecraft:upgrade",
"data": 2
}
},
"result": {
"item": "refinedstorage:upgrade",
"data": 4
}
}

23
src/main/resources/assets/refinedstorage/recipes/storage_housing.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GRG",
"R R",
"EEE"
],
"key": {
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"R": {
"item": "minecraft:redstone"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:storage_housing"
}
}

32
src/main/resources/assets/refinedstorage/recipes/storage_monitor.json Normal file
View File

@@ -0,0 +1,32 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"PCG",
"EMG",
"PDG"
],
"key": {
"P": {
"item": "refinedstorage:basic_processor"
},
"C": {
"item": "refinedstorage:construction_core"
},
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "refinedstorage:destruction_core"
}
},
"result": {
"item": "refinedstorage:storage_monitor"
}
}

23
src/main/resources/assets/refinedstorage/recipes/upgrade.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EGE",
"EPE",
"EGE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"G": {
"type": "forge:ore_dict",
"ore": "blockGlass"
},
"P": {
"item": "refinedstorage:improved_processor"
}
},
"result": {
"item": "refinedstorage:upgrade"
}
}

25
src/main/resources/assets/refinedstorage/recipes/wireless_crafting_monitor.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"EME",
"EAE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "minecraft:ender_pearl"
},
"M": {
"item": "refinedstorage:crafting_monitor"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:wireless_crafting_monitor"
}
}

26
src/main/resources/assets/refinedstorage/recipes/wireless_fluid_grid.json Normal file
View File

@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"EGE",
"EAE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "minecraft:ender_pearl"
},
"G": {
"item": "refinedstorage:grid",
"data": 3
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:wireless_fluid_grid"
}
}

25
src/main/resources/assets/refinedstorage/recipes/wireless_grid.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"EGE",
"EAE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "minecraft:ender_pearl"
},
"G": {
"item": "refinedstorage:grid"
},
"A": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:wireless_grid"
}
}

25
src/main/resources/assets/refinedstorage/recipes/wireless_transmitter.json Normal file
View File

@@ -0,0 +1,25 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"EME",
"EAE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"A": {
"item": "refinedstorage:advanced_processor"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"P": {
"item": "minecraft:ender_pearl"
}
},
"result": {
"item": "refinedstorage:wireless_transmitter"
}
}

19
src/main/resources/assets/refinedstorage/recipes/wrench.json Normal file
View File

@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"EPE",
"EEE",
" E "
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "refinedstorage:basic_processor"
}
},
"result": {
"item": "refinedstorage:wrench"
}
}

28
src/main/resources/assets/refinedstorage/recipes/writer.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ECE",
"RMR",
"EIE"
],
"key": {
"E": {
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "refinedstorage:construction_core"
},
"R": {
"item": "minecraft:redstone"
},
"M": {
"item": "refinedstorage:cable"
},
"I": {
"item": "refinedstorage:advanced_processor"
}
},
"result": {
"item": "refinedstorage:writer"
}
}