From 2c4add0fdfc26d125b49f4d0d745045aa0f2c242 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 25 Mar 2014 22:06:54 -0500 Subject: [PATCH] Crafting Begin. --- block/crafting/BlockCraftingUnit.java | 17 +++++++++++++++++ block/crafting/BlockMolecularAssembler.java | 17 +++++++++++++++++ core/Registration.java | 6 ++++++ core/features/AEFeature.java | 2 +- items/materials/MaterialType.java | 2 ++ items/storage/ItemEncodedPattern.java | 17 +++++++++++++++++ 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 block/crafting/BlockCraftingUnit.java create mode 100644 block/crafting/BlockMolecularAssembler.java create mode 100644 items/storage/ItemEncodedPattern.java diff --git a/block/crafting/BlockCraftingUnit.java b/block/crafting/BlockCraftingUnit.java new file mode 100644 index 000000000..decba098e --- /dev/null +++ b/block/crafting/BlockCraftingUnit.java @@ -0,0 +1,17 @@ +package appeng.block.crafting; + +import java.util.EnumSet; + +import net.minecraft.block.material.Material; +import appeng.block.AEBaseBlock; +import appeng.core.features.AEFeature; + +public class BlockCraftingUnit extends AEBaseBlock +{ + + public BlockCraftingUnit() { + super( BlockCraftingUnit.class, Material.iron ); + setfeature( EnumSet.of( AEFeature.Crafting ) ); + } + +} diff --git a/block/crafting/BlockMolecularAssembler.java b/block/crafting/BlockMolecularAssembler.java new file mode 100644 index 000000000..9348068b9 --- /dev/null +++ b/block/crafting/BlockMolecularAssembler.java @@ -0,0 +1,17 @@ +package appeng.block.crafting; + +import java.util.EnumSet; + +import net.minecraft.block.material.Material; +import appeng.block.AEBaseBlock; +import appeng.core.features.AEFeature; + +public class BlockMolecularAssembler extends AEBaseBlock +{ + + public BlockMolecularAssembler() { + super( BlockMolecularAssembler.class, Material.iron ); + setfeature( EnumSet.of( AEFeature.Crafting ) ); + } + +} diff --git a/core/Registration.java b/core/Registration.java index 989872f11..0901e4f60 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -30,6 +30,8 @@ import appeng.api.networking.ticking.ITickManager; import appeng.api.parts.IPartHelper; import appeng.api.util.AEColor; import appeng.api.util.AEItemDefinition; +import appeng.block.crafting.BlockCraftingUnit; +import appeng.block.crafting.BlockMolecularAssembler; import appeng.block.grindstone.BlockCrank; import appeng.block.grindstone.BlockGrinder; import appeng.block.misc.BlockCellWorkbench; @@ -98,6 +100,7 @@ import appeng.items.parts.ItemPart; import appeng.items.parts.PartType; import appeng.items.storage.ItemBasicStorageCell; import appeng.items.storage.ItemCreativeStorageCell; +import appeng.items.storage.ItemEncodedPattern; import appeng.items.storage.ItemSpatialStorageCell; import appeng.items.storage.ItemViewCell; import appeng.items.tools.ToolBiometricCard; @@ -269,6 +272,8 @@ public class Registration blocks.blockQuartzOreCharged = addFeature( OreQuartzCharged.class ); blocks.blockMatrixFrame = addFeature( BlockMatrixFrame.class ); blocks.blockQuartz = addFeature( BlockQuartz.class ); + blocks.blockCraftingUnit = addFeature( BlockCraftingUnit.class ); + blocks.blockMolecularAssembler = addFeature( BlockMolecularAssembler.class ); blocks.blockFluix = addFeature( BlockFluix.class ); blocks.blockSkyStone = addFeature( BlockSkyStone.class ); blocks.blockSkyChest = addFeature( BlockSkyChest.class ); @@ -312,6 +317,7 @@ public class Registration items.itemCellCreative = addFeature( ItemCreativeStorageCell.class ); items.itemViewCell = addFeature( ItemViewCell.class ); + items.itemEncodedPattern = addFeature( ItemEncodedPattern.class ); items.itemCell1k = addFeature( ItemBasicStorageCell.class, MaterialType.Cell1kPart, 1 ); items.itemCell4k = addFeature( ItemBasicStorageCell.class, MaterialType.Cell4kPart, 4 ); diff --git a/core/features/AEFeature.java b/core/features/AEFeature.java index e94732fb8..348fe086b 100644 --- a/core/features/AEFeature.java +++ b/core/features/AEFeature.java @@ -26,7 +26,7 @@ public enum AEFeature ChargedStaff("Tools"), EntropyManipulator("Tools"), MatterCannon("Tools"), WirelessAccessTerminal("Tools"), - PowerGen("NetworkFeatures"), Security("NetworkFeatures"), + Crafting("NetworkFeatures"), PowerGen("NetworkFeatures"), Security("NetworkFeatures"), // Crafting("NetworkFeatures"), MolecularAssembler("NetworkFeatures"), diff --git a/items/materials/MaterialType.java b/items/materials/MaterialType.java index eb6663c1f..074d7cfd3 100644 --- a/items/materials/MaterialType.java +++ b/items/materials/MaterialType.java @@ -51,6 +51,8 @@ public enum MaterialType WoodenGear(AEFeature.GrindStone, "gearWood"), + BlankPattern, + Wireless(AEFeature.WirelessAccessTerminal), WirelessBooster(AEFeature.WirelessAccessTerminal), FormationCore, AnnihilationCore, diff --git a/items/storage/ItemEncodedPattern.java b/items/storage/ItemEncodedPattern.java new file mode 100644 index 000000000..3f1cf83a8 --- /dev/null +++ b/items/storage/ItemEncodedPattern.java @@ -0,0 +1,17 @@ +package appeng.items.storage; + +import java.util.EnumSet; + +import appeng.core.features.AEFeature; +import appeng.items.AEBaseItem; + +public class ItemEncodedPattern extends AEBaseItem +{ + + public ItemEncodedPattern() { + super( ItemEncodedPattern.class ); + setfeature( EnumSet.of( AEFeature.Crafting ) ); + setMaxStackSize( 1 ); + } + +}