diff --git a/src/main/java/storagecraft/StorageCraftBlocks.java b/src/main/java/storagecraft/StorageCraftBlocks.java index e21ed179d..068c92c25 100644 --- a/src/main/java/storagecraft/StorageCraftBlocks.java +++ b/src/main/java/storagecraft/StorageCraftBlocks.java @@ -2,6 +2,7 @@ package storagecraft; import storagecraft.block.BlockCable; import storagecraft.block.BlockController; +import storagecraft.block.BlockDestructor; import storagecraft.block.BlockDetector; import storagecraft.block.BlockDrive; import storagecraft.block.BlockExporter; @@ -25,4 +26,5 @@ public class StorageCraftBlocks public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); public static final BlockSolderer SOLDERER = new BlockSolderer(); public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); + public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); } diff --git a/src/main/java/storagecraft/block/BlockDestructor.java b/src/main/java/storagecraft/block/BlockDestructor.java new file mode 100644 index 000000000..3112e7cdd --- /dev/null +++ b/src/main/java/storagecraft/block/BlockDestructor.java @@ -0,0 +1,20 @@ +package storagecraft.block; + +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import storagecraft.tile.TileDestructor; + +public class BlockDestructor extends BlockBase implements ITileEntityProvider +{ + public BlockDestructor() + { + super("destructor"); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) + { + return new TileDestructor(); + } +} diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java index 7b52e96f7..aeae67d4c 100644 --- a/src/main/java/storagecraft/proxy/CommonProxy.java +++ b/src/main/java/storagecraft/proxy/CommonProxy.java @@ -31,6 +31,7 @@ import storagecraft.network.MessageStoragePush; import storagecraft.network.MessageTileUpdate; import storagecraft.tile.TileCable; import storagecraft.tile.TileController; +import storagecraft.tile.TileDestructor; import storagecraft.tile.TileDetector; import storagecraft.tile.TileDrive; import storagecraft.tile.TileExporter; @@ -73,6 +74,7 @@ public class CommonProxy GameRegistry.registerTileEntity(TileDetector.class, "detector"); GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wirelessTransmitter"); + GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); GameRegistry.registerBlock(StorageCraftBlocks.CONTROLLER, "controller"); GameRegistry.registerBlock(StorageCraftBlocks.CABLE, ItemBlockCable.class, "cable"); @@ -85,6 +87,7 @@ public class CommonProxy GameRegistry.registerBlock(StorageCraftBlocks.MACHINE_CASING, "machineCasing"); GameRegistry.registerBlock(StorageCraftBlocks.SOLDERER, "solderer"); GameRegistry.registerBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER, "wirelessTransmitter"); + GameRegistry.registerBlock(StorageCraftBlocks.DESTRUCTOR, "destructor"); GameRegistry.registerItem(StorageCraftItems.STORAGE_CELL, "storageCell"); GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID, "wirelessGrid"); @@ -192,6 +195,17 @@ public class CommonProxy // Crafting Grid SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); + // Wireless Transmitter + GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.WIRELESS_TRANSMITTER), + "EPE", + "EME", + "EAE", + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'A', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'P', new ItemStack(Items.ender_pearl), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) + ); + // Wireless Grid Plate GameRegistry.addRecipe(new ItemStack(StorageCraftItems.WIRELESS_GRID_PLATE), " P ", @@ -202,7 +216,6 @@ public class CommonProxy 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) ); - // @TODO: Wireless Transmitter // Wireless Grid SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); @@ -234,6 +247,18 @@ public class CommonProxy new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) ); + // Destructor + GameRegistry.addShapedRecipe(new ItemStack(StorageCraftBlocks.DESTRUCTOR), + "EDE", + "RMR", + "EIE", + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'D', new ItemStack(StorageCraftItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING), + 'I', new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); + // Detector GameRegistry.addRecipe(new ItemStack(StorageCraftBlocks.DETECTOR), "ECE", diff --git a/src/main/java/storagecraft/tile/TileDestructor.java b/src/main/java/storagecraft/tile/TileDestructor.java new file mode 100644 index 000000000..b067a226a --- /dev/null +++ b/src/main/java/storagecraft/tile/TileDestructor.java @@ -0,0 +1,16 @@ +package storagecraft.tile; + +public class TileDestructor extends TileMachine +{ + @Override + public int getEnergyUsage() + { + return 1; + } + + @Override + public void updateMachine() + { + // @TODO: ... + } +}