diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java index 40f118d5b..6b0adff39 100755 --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -10,4 +10,5 @@ public final class RefinedStorageItems { public static final ItemSilicon SILICON = new ItemSilicon(); public static final ItemProcessor PROCESSOR = new ItemProcessor(); public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); + public static final ItemPattern PATTERN = new ItemPattern(); } diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java new file mode 100755 index 000000000..0f6040e7e --- /dev/null +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -0,0 +1,7 @@ +package refinedstorage.item; + +public class ItemPattern extends ItemBase { + public ItemPattern() { + super("pattern"); + } +} diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index ccf539708..4085cfd48 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -82,6 +82,8 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID, 0, new ModelResourceLocation("refinedstorage:wireless_grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory")); + // Blocks ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 4dc6f1e7e..69b7c3933 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -88,6 +88,7 @@ public class CommonProxy { registerItem(RefinedStorageItems.SILICON); registerItem(RefinedStorageItems.PROCESSOR); registerItem(RefinedStorageItems.STORAGE_PART); + registerItem(RefinedStorageItems.PATTERN); // Processors SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); @@ -342,6 +343,16 @@ public class CommonProxy { 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); + // Pattern + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.PATTERN)), + "GRG", + "RGR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); + // Storage Blocks SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index d7de1cffc..857bd0f71 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -110,4 +110,5 @@ item.refinedstorage:processor.6.name=Printed Silicon item.refinedstorage:storage_part.0.name=1k Storage Part item.refinedstorage:storage_part.1.name=4k Storage Part item.refinedstorage:storage_part.2.name=16k Storage Part -item.refinedstorage:storage_part.3.name=64k Storage Part \ No newline at end of file +item.refinedstorage:storage_part.3.name=64k Storage Part +item.refinedstorage:pattern.name=Pattern \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 6cdc1b0da..8d7c7d927 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -110,4 +110,5 @@ item.refinedstorage:processor.6.name=Gedrukte Silicon item.refinedstorage:storage_part.0.name=1k Opslagdeel item.refinedstorage:storage_part.1.name=4k Opslagdeel item.refinedstorage:storage_part.2.name=16k Opslagdeel -item.refinedstorage:storage_part.3.name=64k Opslagdeel \ No newline at end of file +item.refinedstorage:storage_part.3.name=64k Opslagdeel +item.refinedstorage:pattern.name=Patroon \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/pattern.json b/src/main/resources/assets/refinedstorage/models/item/pattern.json new file mode 100755 index 000000000..3a9bd3424 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/pattern" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/items/pattern.png b/src/main/resources/assets/refinedstorage/textures/items/pattern.png new file mode 100755 index 000000000..98129707b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/pattern.png differ