add solderer, processors, silicon, quartz enriched iron

2015-12-23 14:12:23 +01:00
parent d0fbc2f540
commit 06fa4555cb
32 changed files with 785 additions and 58 deletions
--- a/src/main/java/storagecraft/proxy/CommonProxy.java
+++ b/src/main/java/storagecraft/proxy/CommonProxy.java
@@ -16,6 +16,7 @@ import storagecraft.gui.GuiHandler;
 import storagecraft.item.ItemBlockCable;
 import storagecraft.item.ItemBlockGrid;
 import storagecraft.item.ItemCore;
+import storagecraft.item.ItemProcessor;
 import storagecraft.network.MessageCompareUpdate;
 import storagecraft.network.MessageDetectorAmountUpdate;
 import storagecraft.network.MessageDetectorModeUpdate;
@@ -33,7 +34,13 @@ import storagecraft.tile.TileDrive;
 import storagecraft.tile.TileExporter;
 import storagecraft.tile.TileGrid;
 import storagecraft.tile.TileImporter;
+import storagecraft.tile.TileSolderer;
 import storagecraft.tile.TileStorageProxy;
+import storagecraft.tile.solderer.SoldererRecipeCraftingGrid;
+import storagecraft.tile.solderer.SoldererRecipeDrive;
+import storagecraft.tile.solderer.SoldererRecipePrintedProcessor;
+import storagecraft.tile.solderer.SoldererRecipeProcessor;
+import storagecraft.tile.solderer.SoldererRegistry;

 public class CommonProxy
 {
@@ -60,6 +67,7 @@ public class CommonProxy
 		GameRegistry.registerTileEntity(TileImporter.class, "importer");
 		GameRegistry.registerTileEntity(TileExporter.class, "exporter");
 		GameRegistry.registerTileEntity(TileDetector.class, "detector");
+		GameRegistry.registerTileEntity(TileSolderer.class, "solderer");

 		GameRegistry.registerBlock(StorageCraftBlocks.CONTROLLER, "controller");
 		GameRegistry.registerBlock(StorageCraftBlocks.CABLE, ItemBlockCable.class, "cable");
@@ -70,120 +78,160 @@ public class CommonProxy
 		GameRegistry.registerBlock(StorageCraftBlocks.EXPORTER, "exporter");
 		GameRegistry.registerBlock(StorageCraftBlocks.DETECTOR, "detector");
 		GameRegistry.registerBlock(StorageCraftBlocks.MACHINE_CASING, "machineCasing");
+		GameRegistry.registerBlock(StorageCraftBlocks.SOLDERER, "solderer");

 		GameRegistry.registerItem(StorageCraftItems.STORAGE_CELL, "storageCell");
 		GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID, "wirelessGrid");
-		GameRegistry.registerItem(StorageCraftItems.STORIGIUM_INGOT, "storigiumIngot");
+		GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "storigiumIngot");
 		GameRegistry.registerItem(StorageCraftItems.CORE, "core");
+		GameRegistry.registerItem(StorageCraftItems.SILICON, "silicon");
+		GameRegistry.registerItem(StorageCraftItems.PROCESSOR, "processor");

-		GameRegistry.addRecipe(new ItemStack(StorageCraftItems.STORIGIUM_INGOT, 4),
+		// Processors
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED));
+		SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON));
+
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC));
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED));
+		SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED));
+
+		// Silicon
+		GameRegistry.addSmelting(Items.quartz, new ItemStack(StorageCraftItems.SILICON), 0.5f);
+
+		// Quartz Enriched Iron
+		GameRegistry.addRecipe(new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON, 4),
 			"II",
 			"IQ",
 			'I', new ItemStack(Items.iron_ingot),
 			'Q', new ItemStack(Items.quartz)
 		);

+		// Machine Casing
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.MACHINE_CASING),
-			"SSS",
-			"S S",
-			"SSS",
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT)
+			"EEE",
+			"E E",
+			"EEE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON)
 		);

+		// Construction Core
 		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-			new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
-			new ItemStack(Items.gold_ingot),
+			new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
 			new ItemStack(Items.glowstone_dust)
 		);

+		// Destruction Core
 		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-			new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
-			new ItemStack(Items.quartz),
-			new ItemStack(Items.glowstone_dust)
+			new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+			new ItemStack(Items.quartz)
 		);

+		// Constroller
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.CONTROLLER),
-			"SDS",
-			"DRD",
-			"SDS",
+			"EDE",
+			"SRS",
+			"ESE",
 			'D', new ItemStack(Items.diamond),
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
-			'R', new ItemStack(Blocks.redstone_block)
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			'R', new ItemStack(Items.redstone),
+			'S', new ItemStack(StorageCraftItems.SILICON)
 		);

-		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.DRIVE),
-			new ItemStack(StorageCraftBlocks.MACHINE_CASING),
-			new ItemStack(Blocks.chest)
+		// Solderer
+		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.SOLDERER),
+			"ESE",
+			"E E",
+			"ESE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			'S', new ItemStack(Blocks.sticky_piston)
 		);

+		// Drive
+		SoldererRegistry.addRecipe(new SoldererRecipeDrive());
+
+		// Cable
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.CABLE, 6, 0),
-			"SSS",
-			"GGG",
-			"SSS",
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
-			'G', new ItemStack(Blocks.glass)
+			"EEE",
+			"GRG",
+			"EEE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			'G', new ItemStack(Blocks.glass),
+			'R', new ItemStack(Items.redstone)
 		);

+		// Sensitive Cable
 		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.CABLE, 1, 1),
 			new ItemStack(StorageCraftBlocks.CABLE, 1, 0),
 			new ItemStack(Items.redstone)
 		);

+		// Grid
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.GRID, 1, 0),
-			"SCS",
-			"GMG",
-			"SDS",
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
-			'G', new ItemStack(Blocks.glass),
+			"ECE",
+			"PMP",
+			"EDE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
+			'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
 			'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
 			'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
 			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
 		);

-		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.GRID, 1, 1),
-			new ItemStack(StorageCraftBlocks.GRID, 1, 0),
-			new ItemStack(Blocks.crafting_table)
-		);
+		// Crafting Grid
+		SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid());

+		// Wireless Grid
 		GameRegistry.addRecipe(new ItemStack(StorageCraftItems.WIRELESS_GRID),
 			"PCP",
-			"PGP",
+			"PAP",
 			"PDP",
 			'P', new ItemStack(Items.ender_pearl),
 			'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
 			'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-			'G', new ItemStack(Blocks.glass)
+			'A', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED)
 		);

+		// Storage Proxy
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.STORAGE_PROXY),
-			"SCS",
+			"CED",
 			"HMH",
-			"SDS",
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
+			"EPE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
 			'H', new ItemStack(Blocks.chest),
 			'C', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
 			'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
+			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING),
+			'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
 		);

+		// Importer
 		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.IMPORTER),
 			new ItemStack(StorageCraftBlocks.MACHINE_CASING),
-			new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION)
+			new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
+			new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
 		);

+		// Exporter
 		GameRegistry.addShapelessRecipe(new ItemStack(StorageCraftBlocks.EXPORTER),
 			new ItemStack(StorageCraftBlocks.MACHINE_CASING),
-			new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION)
+			new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
+			new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
 		);

+		// Detector
 		GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.DETECTOR),
-			"SCS",
+			"ECE",
 			"RMR",
-			"SRS",
-			'S', new ItemStack(StorageCraftItems.STORIGIUM_INGOT),
+			"EPE",
+			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
 			'R', new ItemStack(Items.redstone),
 			'C', new ItemStack(Items.comparator),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
+			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING),
+			'P', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
 		);

 		// @TODO: Recipe for storage cells